Fixed build problems with Image/RGBAImage.