Fixpack

Issues #55, #57, #70.