BS12 compile fixes for Constructs