Minor config and module changes