Fixed additional problems