Final Bug Fixes for Acceptance Testing