Fix: various 20141028

See more extensive comments in each commit that says what it is for.