Fixing some minor stuff