Add @paglias suggested fixes