temporary fixes that should work for now