Some Fixes (Still Version 0.541)