small fixes due to merging