Fixes + Commit 264