Minor fixes, patches and so on