Fixed all that broken stuff