Fixed last commit merge issues