Small patches by Lokot.