Fix to some pixel grid alignment issues