Minor fine tuning