Bug Fixes

Round 2