Fixed application bugs