Patch 3

Little bit of fixes :)