Victor

Merging fixes into master.