Few crash fixes / issues before bed