Complete -O3 compliance