Series of Fixes #1