Fixes for * mark