This commit should be the final bannering fixes