Make options hash a bit more consistent