Fixing some small stuff