[#278] Couple of minor fixes for after master merge