Fixes for registering new options