Fixes for sean & yuriy stuff