more Fixes