Bug Fixes

Just fixing things ...