First set of fixes