Fixes for missing definitions, also updates from master