Rudimentary Fixes