Commit 3 Description: Bug fixes