Fixes for Beta 4 changes and some clarity on optionals