Some hackish fixes...