Found more bugs introduced with the switch to the gradle build system.