Fix Visual Runtime Errors

Fix Visual Runtime Errors