Misc. updates
Merge changes from dev box