ordinary onepage fixes