imported Burocrat changes
minor changes to remove warnings and errors