back port 2 quick fixes.