Fix Rob or Patrick's Scala mess

As a VSD™ (Verified Scala Developer) I've had to go in and fix Rob/Patrick's mess. Now the Scala should compile