Fixed some stuff in com.nicolai