#350 Fix 2 small issues