misc fixes to get ogsl/issl/epsd2 basically up