More Fixes after Testing