Fixes&cleanups