Ongoing messaging implementation
Fix small variable mismatch error in dock