fast bug fixes