First set of (hopefully) last changes