Minor fixes after implementation of 'options'