Added missing surface commit and fixed values