My first batch of fixes