Various fixes and IImage corrections.