Fixed small structural problems