several quick fixes