Fixes for lychee.net.*