some stupid 'fixes' for some segfaults