Ashkan: some issues resolved (from code reviews)