Fixes for Maker post check