Small modifications for final release