Fixes for BukkitForge