Preparations for 16x32 support