Some problems fixed