Merge pull request #469 from bhariharan/fast_user

Some bug fixes and test fixes