Fixes on the way

weee