Fixed controller/service references