UPDATE: Some fixes