Last couple of fixes