Fixed horrible broken things