fixing more warnings/errors