hopefully last wave of error fixes