various fixes for stuff