Some fixes:)