[FIX] Fixed some problems after last commits