Added a couple of fixes