Merge + fixes