yet more build fixes, apparently travis doesn't support using style typedefs