Fixes from Thamus