Fixed minor issue for final release