#249, small adjustments