Varous Bug Fixes