More fixes for user implementation.