First round of needed fixes after the overhaul