2nd commit init fixes