Fixed: Some stuff