altered misc files to remove warnings