some more quick fixes