Commit old fixes