Fixed different things

Last build was crap