More fixes

:)