more elastic fixes