SURF fixes