A Few Fixes

//cc @scottrobertson