fixes to release compilation