[5.0] Fix array aligments