Commit bug fixes