Small fixes:)