Implemented some of kiwifb's changes which I missed during the last merge.