New bunch of fixes