Initial Bug Fixes