include fixes from marbin