Few fixes to macstrap