Minor fixes (hopefully)