fixes, emergency fixes