Fix service and action creation