Fixes to the features that were just added...