Minor fixes for new approach