Minor fixes after Caglar's changes