Fixes related to latest modern syntax changes