Fixing some workspace bugs.