Fixin more stuff