Changes for all-scala version of plugin 42