Bug Fixes, housekeeping