Merging rep

Minor fixes