Few fixes

Ministry fix might conflict with Justin's ministry fix