Working Fixes