some small fast bug fixes