remove warnings and using closures with the latest Liberty trunk