Fix few things after merging #18