More fixing fixes