Image improvements, compile fix