OK we have tested and re-tested both of these suggestions with no bugs at all evident or/nor reproducible.
To see "both" modifications at work at one of our Forums you are welcome to visit -
https://www.thecomforters.org/discussion/ubbthreads.php?ubb=calendar - No plug intended as that site does not solicit members. If the Team thinks it necessary just edit this post and they can see it in action once they are done at their own Forum.
Thanks Team UBB - UBBest!
