FIX: BUg fixes after merge