Some fixes V