Minor changes to Block