Batch of fixes #1