Series of Bug fixes #2