Fixed more bugs VS is happy now