Minor fixes for master