Further changes to get code closer to release