small fast fixes