Fix several stupid bugs I let slip into the release
Fix several stupid bugs I let slip into the release

joel-porquet/tsar-uclibc,joel-porquet/tsar-uclibc,joel-porquet/tsar-uclibc,joel-porquet/tsar-uclibc