Fix a few things after applying @capooti's patch to use m2m for Service<->Layer