Commit with new bug fixes