Fixes

Minor bug fixes.