Fix things + Separate configs