[Multiple] Minor refactoring bugfixes
[Multiple] Minor refactoring bugfixes

cosnics/cosnics,forelo/cosnics,cosnics/cosnics,forelo/cosnics,cosnics/cosnics,cosnicsTHLU/cosnics,forelo/cosnics,cosnics/cosnics,cosnics/cosnics,cosnicsTHLU/cosnics,cosnics/cosnics,forelo/cosnics,cosnics/cosnics,forelo/cosnics,cosnics/cosnics,forelo/cosnics,forelo/cosnics,cosnicsTHLU/cosnics,cosnicsTHLU/cosnics,cosnicsTHLU/cosnics,forelo/cosnics,cosnicsTHLU/cosnics