Fixed single quote variable issues