Commit latest bug fixes
