Minor adjusments