Fixed Minor Function Problems