Fixes and improvements
Apply new array syntax introduced in b3