Getting back at some fixes