Sprint 4 - Commit 7

Bug fixes