Fixing some alignment pattern issues for versions 7+