Image Class - Fixes