Fixed small stuff