Fixes, and reorderings