Merge fixes.

Signed-off-by: katlogic <kat@lua.cz>