Small fixes before merging