Fixes from this weekend