Fixed up temporary additions