And fixing my fixes :)