Clean up Fixes #2