Minor

Quick small changes and merge back to master branch