More samples ported.
Fix codebase to work with 2.063