Fixes & More extension methods