Few Quick Bug Fixes