Added application specific quirks

Fixed #1844