Fixed some optional stuff