Fixed VS complaints