Fixes/updates from the previous weeks...