GlobalController and small fixes