initial set of fixes