Multiple Tiny Fixes