Minor custom modules modifications