Fixed compile issues due to yesterdays commits