BUG: Fixes for any bugs