Forks

Forks by @paveloom. Small little patches here and there.