Reserved metadata moved from metadata sub array
Fixed IDE warnings