fixes for broken stuff