bug fixes - still need to test full upgrade