some other bad fixes