Restored some missing code
Aligned build with OneJS v3
Moving works!