Some custom fixes
Set Last Change to 2013-10-22
Clarify a FIXME note for pasting