Bug fixes for acceptance testing