Some fixes/add to prev commit