Fixed/Removed warnings