Version 1 fixes