late bug fixes