foundation: fixes