Fixes for re-ordering of implementation.