Tiny fixes.
Need to implement non-static stratum service now.