Changes made as part of 0.8