Various fix.