Some more quick fixes