Some more fixes, some includes had to be added for some reason when logging is off