Minor bug fixes
Merge branch 'bleeding_edge'
Various minor bug fixes