Vanilla compiles again

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Improve skylands, The End and decorators

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>