Some stuff needed fixing