Fixed problems with my fixes