Various fixes3