Compile Fix and Configuration Fix

MashControl wasn't compiling and there was another fix to prevent a null
pointer exception when creating a new configuration