Minor fixes for final version