Fixed recent issues