Resolving couple of problems after code changes.