Fixing run time issues