tymon: and some small fix