Minors Fixes