Minor fixes, noref