Finalizing Fixes #2