Little fixing here and there