Some fixes, adjustments