Version 2 Bug Fixes