Various fixes in system callback manager implementation to get it actually to work