Fixes & simplifications.