Type fixes
Including settings outside of init, settings passed into init