#160 more Fixes