Small latest fixes - produce final version