Minor import and RGBA fixes.