More Services Fixes