Random fixes for issues I came accross accidentaly