Fixes from BigNoid