General fixes, extensions...