Fixes in __construct()