Fixing some stuff :P