Draft: Fixes bugs from last commit