Fix  stuff