Few minor changes, for proper build