Fixes for Mike 08.29.14