Fixed code stuff