Squashed a few compiler errors