More Glowstone fixes