Compile fix for recent engine change (not guaranteed to actually work properly ..) plus some checkstyle fixes