Fixed a couple of issues from kolibri