Some fixes - Testing with standalone version