Various fixes
GChax