Minor Fixes after testing