Various fixes for final release