Merge minor changes from dev to master