Fixes for listing and creating account