Some minor modifications to core and fidocalc plugins