fixes from atrium