fix warning etc