Fixing some borkedness