Additional Bug Fixes