A few more changes per feedback related to sqlx usage