Bug Fixes 1.3