Fixed problems after chasseurmic's merge