Minor fixes for version 0.15.1