addl fixes