Fixing some stuff :)