Slight fixes (Need to add the Boolean literals)