Clean up
More fixes for init @OliverG96