Resolved a few minor issues on my branch